OGM-208

Follow-up to @DavideD's work with misc. improvements