implemented Tom's recommendations