Slightly less janky