cleaned #3 a bit.