updated... Minor/major improvement