more sturcture changes