Refactored 10th a bit