Adapted for unicore systems