latest changes, all working