Start fixing the jank