cleaned up noOAGi code