Redesined and tweaked