update to work with devsmart-android