added typesetting