Added gm check