improved modification markers
removed Unselect, this caused assertion