huge code updates