smaller code and ready for a 404 call maybe