Got rid of kluged value for am_sender, and instead added a new