Fİxed broken stuff