Still still still removing hardcoding