removed hard coded code