merging LINX changes