NoTask - refactored middleware