Partial relative fix

Still buggy but better