Modified to avoid dependency