New style

@mozboz please test