refactor astro to be more timely