Improves first usable build