Alireza: version 2 of my two features