mechanism for custom in place
fixed merge conflicts