Final submission for 312 (commited from different working dir)