removed old ltext function
merged files