Updated with style from class