Moving two more personal functions