Commit before WE. Not fully working