Re-organized stuff a bit
Chanes