Added Changes of inputting Data - need some debugging