Added changes made with Adam

Pull request from Ariel.