Working on more reqs elimination