New Functions, fixed old one