kai's changes and comments
removed my notes