Moved earlier in build