changes for visualight
fixed merge conflicts