removed so many feakin errros