Fixed make check errors. Code Working!!!