finished DiscardController second draft