All raffi's changes and never mind about the test Duncan sorry Raffi was working on an old version :)