more changes to Magic numbers