Remodeling the application