dev2 updated again and commited changes