Change function structure