Merging Yasemin's changes