paths modified and various changes original commit in short was an old version