add subjects more cleanly.