Updated 473 handler