working on ticket #8