Basebuilding 1.2 with improvements