Less jank please