Changed return type and arguments