New functions, everything works now!