updated as per logcat