updated to newest version (removed states/binding)