Add binstubs and repeat function