Pre Version 1.1 commit