manually merged in luis's changes