Commited first set of changes