Unstable: still trying to fix retina support