Alireza: update the first and second features