suggested changes by tbarbugli