Develop

small changes based on testing