switching over to will's shexy screen + some minor changes