Fix & Replace damn functions