lel
Resolved conflicts
MAin loop improvements