First changes from Tom7s original