non code stuff modified