HARD CODE ADDED