Added changes and updated setup