Debugged and added Raw-Results