Fixed building with all new features