Commit of my last 2 days work