Updated magic numbers