getting up to date with Ethans (no change yet)