helper improvements