updated, working on styles