still trying to fix Dstar