EDD stuff added