CASA core implementation + adjustement