Getting closer to final style