Changes by Nick before makin glive