simplified some cases