Title: Vahid : Issue 3