Re-forked and updated