completing incomplete feature from sprint_09