updates to match new styles from x