Change in build method, before adding spaces