attempt to solve jerkyness
resolve merge conflict