done here. all working