Code changed, still has errors!