Major design update