Commiting base code with more logic