Funcional app. Minor Changes