removed hard coded dependency
hand merge