Get rid of pcs and don't build two options arrays