updated final app