major editing on 400 and 500