I added some this and othre things