suite reworked for building