Updated history, gave credit to Jef for help