Updated and styled