adding state values
done merging