Enhanced fork of stjerm