changes made with Nick