fix&delete stuff