removed hardcoded dictionary