simplified some problems