stepped back from some bad design decisions