FOOB-14 Fixing the first thing

Major improvements