various commits for to long time. Need to be more disciplined