Added MESSAGE FOR mDiyo + clean up and updates