Changed my function