Changed a basic flow
Fixed a data push problem. Resolves #46