And removed hardcoding agian