Changed return statements