optimalisations after the deadline

shortened load times