made some crazy changes