adding extra changes to support Astyanax
adding extra changes to support Astyanax