change to build life cycle and conditionals added