with def changes