merged din's latest work, guy's pro. Everything works so far.