updated remaining code