added massage parser