Updated with new discard function