Still trying to fix name bug...