still fixing sate bug