Commited couple of more tasks