updated and finalized everything