edited shaima's stuff