fixing per comments