manual refactoring/updatin/evolving - going mobile