changes added from Dani