There must be a better way. Anyway, merge when ok to you.