upgraded a little