latest modifs from alejandro