BugFix - IV - moving towards a working expansion