Added messages as enhancments
Updated logging function
fixed conflict