touched up code