Updated with bad guy and new infrastructure