Made key functions return values.