Slight changes so its more compatible with nebula