Feature/not me2

when we remove the message it'll break the test and we can fix it then.