Change some subroutin calls