adjusting magic numbers YAY