add status and fix for location.