Added additional features suggested by ogopogomu