added diamond shape and rotation parameter