Fixed recent bug, amde it so user values are pulled if non 0