improved for debugging in production