Bugfix
Reorganise functions yet again
Additional hints