Final commit before user trials