need a little change since the its taking lots of time