Remember to update the last patch
Minor refactoring