CSKnight's changes via Emorelleums coputer