Improved first run