Function Creator updated