Commiting some recent changes