graduates tweaking
fixed merge