Changing name
Now more flexible