Adding better handling of ! with builds
Adding better handling of ! with builds