Changes to provide successful building