Updated and adjusted