now working / added comments