cylinder and pyramid integrated, took out color argument