updated - includes styles from ray :<