oct29 commit version 2