Anmn nrs dar yon

ready to be merged