Trying to deal with key frames better