fixed up get and put