shitton of changes made