Updated the latest code with setup