streamlined this file even further