Status codes moved, new checks added