removed hard coded variables