Fixed almost complete

Shorter loops