Return to dan's design

:)