committing to 1.0 main