changes after DP's help