first commit for dev 2
fixing