added better grab test to edit mode