Changed return types to void