Removed dep on values