rebuilding for 6.6