ok, think it's ok that way. will merge.