updated by dev2 again and commited