Fixed the maching and added conversion form int to string