changes to current to fix errors