attemtpting to tackle #66