Few changes made, broken some bits.