Upgraded a little