8/11 - Astroid case changes