rework and simplification - stress tested under very high load with no issues (over 100k requests)