Updated with hover / air sink changes