some new modifications
