Revamp and improve everything