Updated to Brandon's files