changed to work with extended creation function

not tested, assumed that's working, but didn't tested