recommiting some latest changes