mostly working with some new issues raised