Updated and upgraded stuff