Changed all changes back and is now on same state as the last ctk merge in my xnat-support branch