Small changes from Tanya