Fixed afew bugs & started with the Refresh method