Updated post
Merged changes