some new modifications!