added changes made by Raul