updated for professor review