Build rewrite - passing