Added history feature (No autorun)