Updates, almost a working function