Work on buildmode
Merged