updated helper to follow strict standarts