changing order of source functions