Huge work on draft style 2.0