Bug fix
Restructure
no message