Updated working app