massive changes with nick

massive changes with nick