Added extra functions