removed hardCoding