Mess, save value needs to be fixed now.
Cleaned up mess