RE-ARRANGE ALL CODE. A temp.