Changes from Kjesski =)