More posts work
Merge fixs