There is duplication that need still to be removed.