latest changes and added notes