fixed everything up to 10