new chages by dev 1