Re-organize things a little bit