Made updates and copied from original app