Update GMAssist

full re-work