merged with  files from rubixt