Adapted to style change