updating with some style changes, simplified data (for now)