Updated nick goofing code