Final update before Josh's implementation