#21 Added return values