More DIP work