Update formatting and sped up functionality.