Even more work on post 3