removed hard coded lookup