Complete before any refactoriing