Improved style v2