last commit / added some comments