Improved Base Building