Made functions s: where possible