Completed* changes