First commit after github
slight mods for speed