updating based on gm-tools changes