Made somewhat of an optimization