few changes, also included old style code for users already adjusted