Eliminated silly modifier checks