Manual input improve!