. Bug fixes
. Starting to work but not convinced yet...