Updated Buoy and Astro