Updated post based on more feedback