Updated and prettyfied