final squash

code dublication, no?