Added magic numbers