cleaned up a little more and sent to leison