changes from Joaos comments