Version 08 - Fixes made so far with no errors