Some new modifications!