dev1 merged and updated and commited