1. extracting messages to other file
2. fixing hide low level actions