meebey's draft improvements