few enhacments to last post