Added more into DISCARD section