Function improvements.