Updated, to comply with my third year