removed string comparsions