[UPDATED] - cleanup up and commented code to update to GA 3.3.0