fixed storing stuff