edited and not done