Fixed subject, fixed some outputs