Made sure it works, converted to CDH4.3 and cleaned up not needed stuff