addded my own greviance fixes #3