compiling brett's changes