even closer to final style