basic changes, needs to be organized