Hardcoded Data ra removed