New style and some logic changes