More work on buoy task