Removed Op Checking as it was breaking things