Updated to work with the last version