Fixed#1 and resolved#2 issues