initial commit, copied latest from -rx and updated paths