Looks about right to me, will give it a test later.