removed hard coded settings