simplified some things