fix spec and changes