dev changes

Done with the changes