Improved adaptive style