FIX CODE FOR ALL :)