merged Angelica's version