ok, but has to be before its merged