new chages

we need to merge