A few changes to make things easier.