Refactor. Be ready for individual match 2015