Rmoved hardcodes