updating to current code