Working on a better solution for the xAdj "problem"