upgrading :D still a few bugs