modify to follow Rock's guidelines