Commited small changes to make it runnable