implemented feedback from testing