I9: edited controller