changed things, fixed things, added too much complexity