EDIT- see post below