Middleware 3 and 4 ready for review