removed message creationg to try to increase performance