put back the abs to be sure of correctness and remove extranull test