more changes from final app