now all working