Algorithm improvements. ANDROID!