integrated changes into main file