updated and stylized