Added proper string and storing stuff