merges in julio's changes