merge old code too