Closing in

See comments