Added changes made with Adam