why was this moved? In the new place it's on a creation signal receiver. If we add new receiver that might get confusing.