adding in eriks changes