Changed API in code to fit the new API, added ETA label