completed enhancement #60