beginning to clean up the handling of nicks