changes from Anas taken from Dropbox