Removed extended version (too much failed results)
Mid. level refactorings