Added remainder core functions