Updated to match original formatting