Add other checks from assignment