added rock and got other stuff in