Code alter by instructions from author (Rasmus)