Committing final touch, there can be other errors  but atleast for demo it is done