updated for nickel master