changed some (probably many) things here