take shift, helper fixes + distance calc