more changes to def