Return values and argument passing changed