More complex message redirecting and fixed up code