Added function and rename