Now all working