A whole lot of changes to bring post in-line with latest post