Commited daves changes