implemented gregs feature request