Changed the toBuildstring structure ...