naydeity- finished version!