Updated to match the app
Returned with new things learned