updated for gmme