Working on Issue#5 and Issue#19