simplify logic and changing less from before