Small changes to match UW