Adjust to work with SWE, needs to be generalized