improve rebases