Updated post and put with Amit's suggestions