Student Module ( 1st day ) + Company tweaks