Fix Issue 1 

check adding some changes