some more changes till we figer a better way.